From cbb0ca490214c4b713055433687577ef77ff24ab Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Mar 2020 09:39:56 -0400 Subject: [PATCH] testsuite: Tell meson we use TAP This makes meson actually parse the individual test results. Most of the time, it does not make a difference, but one case where it does is when all the individual tests of a binary are skipped, meson will mark the test as skipped. --- testsuite/a11y/meson.build | 2 ++ testsuite/css/change/meson.build | 1 + testsuite/css/meson.build | 2 ++ testsuite/css/nodes/meson.build | 1 + testsuite/css/parser/meson.build | 1 + testsuite/css/style/meson.build | 1 + testsuite/gdk/meson.build | 1 + testsuite/gsk/meson.build | 1 + testsuite/gtk/meson.build | 2 ++ testsuite/reftests/meson.build | 1 + 10 files changed, 13 insertions(+) diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build index cfb45562cf..57daf3e72c 100644 --- a/testsuite/a11y/meson.build +++ b/testsuite/a11y/meson.build @@ -52,6 +52,7 @@ foreach t: a11y_state_tests test (t + ' state', a11y_dump_bin, args: [ '--tap', '-k', ui_path ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', @@ -86,6 +87,7 @@ foreach t: a11y_tests install_dir: testexecdir, dependencies: libgtk_dep), args: [ '--tap', '-k', ], + protocol: 'tap', timeout: 120, env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build index 5398e5da44..1d5e6dc7c6 100644 --- a/testsuite/css/change/meson.build +++ b/testsuite/css/change/meson.build @@ -11,6 +11,7 @@ test_change = executable( ) test('change', test_change, args: [ '--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build index 43f7a100d0..04bda16093 100644 --- a/testsuite/css/meson.build +++ b/testsuite/css/meson.build @@ -13,6 +13,7 @@ test_api = executable('api', 'api.c', install_dir: testexecdir) test('api', test_api, args: ['--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', @@ -31,6 +32,7 @@ test_data = executable('data', ['data.c', '../../gtk/css/gtkcssdataurl.c'], install_dir: testexecdir) test('data', test_data, args: ['--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build index 264ff58847..264da09100 100644 --- a/testsuite/css/nodes/meson.build +++ b/testsuite/css/nodes/meson.build @@ -8,6 +8,7 @@ test_nodes = executable('test-css-nodes', 'test-css-nodes.c', dependencies: libgtk_dep) test('nodes', test_nodes, args: [ '--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build index ea4b815a59..31acfb23fb 100644 --- a/testsuite/css/parser/meson.build +++ b/testsuite/css/parser/meson.build @@ -465,6 +465,7 @@ foreach testname : test_data '-k', join_paths(meson.current_source_dir(), testname), ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build index efc635b44a..0006359f9a 100644 --- a/testsuite/css/style/meson.build +++ b/testsuite/css/style/meson.build @@ -18,6 +18,7 @@ test_style = executable( ) test('style', test_style, args: [ '--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/gdk/meson.build b/testsuite/gdk/meson.build index 9afd0ca009..69d6481490 100644 --- a/testsuite/gdk/meson.build +++ b/testsuite/gdk/meson.build @@ -21,6 +21,7 @@ foreach t : tests test(t, test_exe, args: [ '--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build index 8c4706f67e..e9fdc661b7 100644 --- a/testsuite/gsk/meson.build +++ b/testsuite/gsk/meson.build @@ -205,6 +205,7 @@ foreach t : tests test(test_name, test_exe, args: [ '--tap', '-k' ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build index 254361e3ea..19a44e7987 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -109,6 +109,7 @@ foreach t : tests test(test_name, test_exe, args: [ '--tap', '-k' ], + #protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', @@ -134,6 +135,7 @@ if add_languages('cpp', required: false) install_dir: testexecdir) test('c++ keywords', test_exe, args: [ '--tap', '-k' ], + #protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GDK_DEBUG=default-settings', diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build index a7d77fe172..3a3706d51b 100644 --- a/testsuite/reftests/meson.build +++ b/testsuite/reftests/meson.build @@ -439,6 +439,7 @@ foreach testname : testdata '-o', join_paths(meson.current_build_dir(), 'output'), join_paths(meson.current_source_dir(), testname), ], + protocol: 'tap', env: [ 'GIO_USE_VOLUME_MONITOR=unix', 'GSETTINGS_BACKEND=memory', 'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir), -- 2.30.2